Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[JTC] Convert lambda to class functions (backport #945) #1015

Merged
merged 4 commits into from
Mar 13, 2024
Merged

[JTC] Convert lambda to class functions (backport #945) #1015

merged 4 commits into from
Mar 13, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 2, 2024

This is an automatic backport of pull request #945 done by Mergify.
Cherry-pick of 833ed7f has failed:

On branch mergify/bp/iron/pr-945
Your branch is up to date with 'origin/iron'.

You are currently cherry-picking commit 833ed7f.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   joint_trajectory_controller/include/joint_trajectory_controller/joint_trajectory_controller.hpp
	modified:   joint_trajectory_controller/src/joint_trajectory_controller.cpp
	modified:   joint_trajectory_controller/test/test_trajectory_controller.cpp
	modified:   joint_trajectory_controller/test/test_trajectory_controller_utils.hpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   joint_trajectory_controller/include/joint_trajectory_controller/tolerances.hpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@christophfroehlich @mergify
[JTC] Convert lambda to class functions (#945)
0e23548 
* Convert lambdas to member functions

* Make member function const

* Add a test for compute_error function

* Make reference_wrapper argument const

* Iterate over error fields

(cherry picked from commit 833ed7f)

# Conflicts:
#	joint_trajectory_controller/include/joint_trajectory_controller/tolerances.hpp
@mergify mergify bot added the conflicts label Feb 2, 2024
@codecov Codecov
Copy link

codecov bot commented Mar 6, 2024

Codecov Report

Attention: Patch coverage is 93.33333% with 1 lines in your changes are missing coverage. Please review.

Project coverage is 71.99%. Comparing base (9b5e04a) to head (0f29b46).

Additional details and impacted files 
@@            Coverage Diff             @@
##             iron    #1015      +/-   ##
==========================================
- Coverage   72.72%   71.99%   -0.73%     
==========================================
  Files          40       40              
  Lines        3505     3503       -2     
  Branches     1750     1750              
==========================================
- Hits         2549     2522      -27     
- Misses        659      683      +24     
- Partials      297      298       +1
Flag Coverage Δ
unittests 71.99% <93.33%> (-0.73%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Coverage Δ
...jectory_controller/joint_trajectory_controller.hpp 100.00% <100.00%> (ø)
...ory_controller/src/joint_trajectory_controller.cpp 79.91% <100.00%> (-0.15%) ⬇️
...include/joint_trajectory_controller/tolerances.hpp 75.67% <0.00%> (ø)

... and 2 files with indirect coverage changes

@bmagyar bmagyar merged commit 1e634f3 into iron Mar 13, 2024
11 of 12 checks passed
@bmagyar bmagyar deleted the mergify/bp/iron/pr-945 branch March 13, 2024 19:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bmagyar bmagyar bmagyar approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@bmagyar @christophfroehlich